diff options
35 files changed, 352 insertions, 52 deletions
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c index a70147f0ce..7e48f97a62 100644 --- a/widgets/table/e-cell-date.c +++ b/widgets/table/e-cell-date.c @@ -5,13 +5,13 @@ */ #include <config.h> -#include "gal/util/e-i18n.h" -#include "e-cell-date.h" -#include <gnome.h> #include <sys/time.h> +#include <time.h> #include <unistd.h> #include <gal/util/e-util.h> #include <gal/widgets/e-unicode.h> +#include <gal/util/e-i18n.h> +#include "e-cell-date.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c index ebac2c78ed..d5f04d9d57 100644 --- a/widgets/table/e-cell-number.c +++ b/widgets/table/e-cell-number.c @@ -5,12 +5,11 @@ */ #include <config.h> -#include "gal/util/e-i18n.h" -#include "e-cell-number.h" -#include <gnome.h> #include <sys/time.h> #include <unistd.h> #include <gal/util/e-util.h> +#include <gal/util/e-i18n.h> +#include "e-cell-number.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c index 0321474677..3e89f53c75 100644 --- a/widgets/table/e-cell-pixbuf.c +++ b/widgets/table/e-cell-pixbuf.c @@ -7,11 +7,8 @@ * */ -#include <glib.h> -#include <gtk/gtk.h> - #include <stdio.h> - +#include <glib.h> #include <libgnomeui/libgnomeui.h> #include "e-cell-pixbuf.h" diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h index b300f410ba..4bb009b655 100644 --- a/widgets/table/e-cell-pixbuf.h +++ b/widgets/table/e-cell-pixbuf.h @@ -10,8 +10,6 @@ #ifndef _E_CELL_PIXBUF_H_ #define _E_CELL_PIXBUF_H_ -#include <glib.h> - #include <gal/e-table/e-table.h> #define E_CELL_PIXBUF_TYPE (e_cell_pixbuf_get_type ()) diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c index 7943ad8d8a..09133d9dff 100644 --- a/widgets/table/e-cell-size.c +++ b/widgets/table/e-cell-size.c @@ -5,11 +5,10 @@ */ #include <config.h> -#include "e-cell-size.h" -#include <gnome.h> #include <sys/time.h> #include <unistd.h> #include <gal/util/e-util.h> +#include "e-cell-size.h" #define PARENT_TYPE e_cell_text_get_type () diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 7e045853b3..4be7439d4c 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -25,6 +25,12 @@ */ #include <config.h> +#include <stdio.h> +#include <unicode.h> +#include <ctype.h> +#include <math.h> +#include <string.h> +#include <gdk/gdkx.h> /* for BlackPixel */ #include <gtk/gtkenums.h> #include <gtk/gtkentry.h> #include <gtk/gtkwindow.h> @@ -32,8 +38,7 @@ #include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> #include <libgnomeui/gnome-canvas.h> -#include <stdio.h> -#include <unicode.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> #include "e-cell-text.h" #include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" @@ -45,9 +50,6 @@ #include "gal/util/e-text-event-processor-emacs-like.h" #include "e-table-tooltip.h" -#include <gdk/gdkx.h> /* for BlackPixel */ -#include <ctype.h> -#include <math.h> #define ECT_CLASS(c) (E_CELL_TEXT_CLASS(GTK_OBJECT((c))->klass)) diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index c38d2efce7..7ebfd4146d 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -14,8 +14,11 @@ #include <config.h> -#include "e-cell-tree.h" +#include <ctype.h> +#include <math.h> +#include <stdio.h> +#include <gdk/gdkx.h> /* for BlackPixel */ #include <gtk/gtkenums.h> #include <gtk/gtkentry.h> #include <gtk/gtkwindow.h> @@ -23,16 +26,12 @@ #include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> #include <libgnomeui/gnome-canvas.h> -#include <stdio.h> #include "e-tree-table-adapter.h" #include "e-tree-model.h" #include "gal/util/e-util.h" #include "e-table-item.h" - -#include <gdk/gdkx.h> /* for BlackPixel */ -#include <ctype.h> -#include <math.h> +#include "e-cell-tree.h" #include "tree-expanded.xpm" #include "tree-unexpanded.xpm" diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c index 0846c7912c..72fe24c6c0 100644 --- a/widgets/table/e-table-click-to-add.c +++ b/widgets/table/e-table-click-to-add.c @@ -8,6 +8,7 @@ * Copyright 1999, 2000 Ximian, Inc. */ #include <config.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include <libgnomeui/gnome-canvas.h> #include <libgnomeui/gnome-canvas-util.h> diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h index f4412cb0ea..5163825a7b 100644 --- a/widgets/table/e-table-click-to-add.h +++ b/widgets/table/e-table-click-to-add.h @@ -2,8 +2,8 @@ #ifndef _E_TABLE_CLICK_TO_ADD_H_ #define _E_TABLE_CLICK_TO_ADD_H_ -#include <libgnomeui/gnome-canvas.h> #include <gnome-xml/tree.h> +#include <libgnomeui/gnome-canvas.h> #include <gal/e-table/e-table-header.h> #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-item.h> diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h index ff334ec1b1..2bcbe75e20 100644 --- a/widgets/table/e-table-column-specification.h +++ b/widgets/table/e-table-column-specification.h @@ -2,6 +2,7 @@ #ifndef _E_TABLE_COLUMN_SPECIFICATION_H_ #define _E_TABLE_COLUMN_SPECIFICATION_H_ +#include <glib.h> #include <gtk/gtkobject.h> #include <gnome-xml/tree.h> diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c index d7f016f9c2..d5116b1a11 100644 --- a/widgets/table/e-table-config-field.c +++ b/widgets/table/e-table-config-field.c @@ -9,7 +9,6 @@ */ #include <config.h> #include <stdlib.h> -#include <gnome.h> #include "gal/util/e-util.h" #include "e-table-config-field.h" diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 04b05cadb7..1b2efa4f02 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -15,11 +15,18 @@ #include <config.h> #include <stdlib.h> -#include "gal/util/e-i18n.h" +#include <string.h> +#include <gtk/gtkentry.h> +#include <gtk/gtklabel.h> +#include <gtk/gtknotebook.h> +#include <gtk/gtksignal.h> +#include <gtk/gtktogglebutton.h> #include <libgnomeui/gnome-dialog.h> +#include <libgnomeui/gnome-propertybox.h> #include <glade/glade.h> #include "e-table-config.h" #include "gal/util/e-util.h" +#include "gal/util/e-i18n.h" #define PARENT_TYPE (gtk_object_get_type()) diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h index 28eb8600e2..13b1d69f38 100644 --- a/widgets/table/e-table-config.h +++ b/widgets/table/e-table-config.h @@ -2,7 +2,7 @@ #ifndef _E_TABLE_CONFIG_H_ #define _E_TABLE_CONFIG_H_ -#include <gnome.h> +#include <libgnome/gnome-defs.h> #include <gal/e-table/e-table-sort-info.h> #include <gal/e-table/e-table-specification.h> #include <gal/widgets/gtk-combo-text.h> diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c new file mode 100644 index 0000000000..bac91c3060 --- /dev/null +++ b/widgets/table/e-table-example-1.c @@ -0,0 +1,286 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* This code is GPL. */ +#include <stdio.h> +#include <string.h> +#include <gdk-pixbuf/gdk-pixbuf.h> + +#include "gal/e-util/e-cursors.h" +#include "e-table-simple.h" +#include "e-table-header.h" +#include "e-table-header-item.h" +#include "e-table-item.h" +#include "e-cell-text.h" +#include "e-cell-checkbox.h" +#include "e-table.h" + +#include "table-test.h" + +/* + * One way in which we make it simpler to build an ETableModel is through + * the ETableSimple class. Instead of creating your own ETableModel + * class, you simply create a new object of the ETableSimple class. You + * give it a bunch of functions that act as callbacks. + * + * You also get to pass a void * to ETableSimple and it gets passed to + * your callbacks. This would be for having multiple models of the same + * type. This is just an example though, so we statically define all the + * data and ignore the void *data parameter. + * + * In our example we will be creating a table model with 6 columns and 10 + * rows. This corresponds to having 6 different types of information and + * 10 different sets of data in our database. + * + * The headers will be hard coded, as will be the example data. + * + */ + +/* + * There are two different meanings to the word "column". The first is + * the model column. A model column corresponds to a specific type of + * data. This is very much like the usage in a database table where a + * column is a field in the database. + * + * The second type of column is a view column. A view column + * corresponds to a visually displayed column. Each view column + * corresponds to a specific model column, though a model column may + * have any number of view columns associated with it, from zero to + * greater than one. + * + * Also, a view column doesn't necessarily depend on only one model + * column. In some cases, the view column renderer can be given a + * reference to another column to get extra information about its + * display. +*/ + +#define ROWS 10 +#define COLS 4 + +#define IMPORTANCE_COLUMN 4 +#define COLOR_COLUMN 5 + +/* + * Here we define the initial layout of the table. This is an xml + * format that allows you to change the initial ordering of the + * columns or to do sorting or grouping initially. This specification + * shows all 5 columns, but moves the importance column nearer to the + * front. It also sorts by the "Full Name" column (ascending.) + * Sorting and grouping take the model column as their arguments + * (sorting is specified by the "column" argument to the leaf elemnt. + */ + +#define INITIAL_SPEC "<ETableSpecification> \ + <columns-shown> \ + <column> 0 </column> \ + <column> 4 </column> \ + <column> 1 </column> \ + <column> 2 </column> \ + <column> 3 </column> \ + </columns-shown> \ + <grouping> <leaf column=\"1\" ascending=\"true\"/> </grouping> \ +</ETableSpecification>" + +char *headers [COLS] = { + "Email", + "Full Name", + "Address", + "Phone" +}; + +/* + * Virtual Column list: + * 0 Email + * 1 Full Name + * 2 Address + * 3 Phone + */ + +char *table_data [ROWS] [COLS]; + +/* + * ETableSimple callbacks + * These are the callbacks that define the behavior of our custom model. + */ + +/* + * Since our model is a constant size, we can just return its size in + * the column and row count fields. + */ + +/* This function returns the number of columns in our ETableModel. */ +static int +my_col_count (ETableModel *etc, void *data) +{ + return COLS; +} + +/* This function returns the number of rows in our ETableModel. */ +static int +my_row_count (ETableModel *etc, void *data) +{ + return ROWS; +} + +/* This function returns the value at a particular point in our ETableModel. */ +static void * +my_value_at (ETableModel *etc, int col, int row, void *data) +{ + return (void *) table_data [row] [col]; +} + +/* This function sets the value at a particular point in our ETableModel. */ +static void +my_set_value_at (ETableModel *etc, int col, int row, const void *val, void *data) +{ + g_free (table_data [row] [col]); + table_data [row] [col] = g_strdup (val); +} + +/* This function returns whether a particular cell is editable. */ +static gboolean +my_is_cell_editable (ETableModel *etc, int col, int row, void *data) +{ + return TRUE; +} + +/* This function duplicates the value passed to it. */ +static void * +my_duplicate_value (ETableModel *etc, int col, const void *value, void *data) +{ + return g_strdup (value); +} + +/* This function frees the value passed to it. */ +static void +my_free_value (ETableModel *etc, int col, void *value, void *data) +{ + g_free (value); +} + +/* This function creates an empty value. */ +static void * +my_initialize_value (ETableModel *etc, int col, void *data) +{ + return g_strdup (""); +} + +/* This function reports if a value is empty. */ +static gboolean +my_value_is_empty (ETableModel *etc, int col, const void *value, void *data) +{ + return !(value && *(char *)value); +} + +/* This function reports if a value is empty. */ +static char * +my_value_to_string (ETableModel *etc, int col, const void *value, void *data) +{ + return g_strdup(value); +} + +/* We create a window containing our new table. */ +static void +create_table (void) +{ + GtkWidget *e_table, *window, *frame; + ECell *cell_left_just; + ETableHeader *e_table_header; + int i, j; + ETableModel *e_table_model = NULL; + + /* First we fill in the simple data. */ + for (i = 0; i < ROWS; i++){ + for (j = 0; j < COLS; j++) + table_data [i] [j] = g_strdup (""); + } + /* Next we create our model. This uses the functions we defined + earlier. */ + e_table_model = e_table_simple_new ( + my_col_count, my_row_count, my_value_at, + my_set_value_at, my_is_cell_editable, + my_duplicate_value, my_free_value, + my_initialize_value, my_value_is_empty, + my_value_to_string, + NULL); + /* + * Next we create a header. The ETableHeader is used in two + * different way. The first is the full_header. This is the + * list of possible columns in the view. The second use is + * completely internal. Many of the ETableHeader functions are + * for that purpose. The only functions we really need are + * e_table_header_new and e_table_header_add_col. + * + * First we create the header. + */ + e_table_header = e_table_header_new (); + + /* + * Next we have to build renderers for all of the columns. + * Since all our columns are text columns, we can simply use + * the same renderer over and over again. If we had different + * types of columns, we could use a different renderer for + * each column. + */ + cell_left_just = e_cell_text_new (e_table_model, NULL, GTK_JUSTIFY_LEFT); + + /* + * Next we create a column object for each view column and add + * them to the header. We don't create a column object for + * the importance column since it will not be shown. + */ + for (i = 0; i < COLS; i++) { + /* Create the column. */ + ETableCol *ecol = e_table_col_new ( + i, headers [i], + 1.0, 20, cell_left_just, + g_str_compare, TRUE); + /* Add it to the header. */ + e_table_header_add_column (e_table_header, ecol, i); + } + + /* + * Here we create a window for our new table. This window + * will get shown and the person will be able to test their + * item. + */ + window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + /* This frame is simply to get a bevel around our table. */ + frame = gtk_frame_new (NULL); + + /* + * Here we create the table. We give it the three pieces of + * the table we've created, the header, the model, and the + * initial layout. It does the rest. + */ + e_table = e_table_new (e_table_header, e_table_model, INITIAL_SPEC); + + /* Build the gtk widget hierarchy. */ + gtk_container_add (GTK_CONTAINER (frame), e_table); + gtk_container_add (GTK_CONTAINER (window), frame); + + /* Size the initial window. */ + gtk_widget_set_usize (window, 200, 200); + + /* Show it all. */ + gtk_widget_show_all (window); +} + +/* This is the main function which just initializes gnome and call our create_table function */ + +int +main (int argc, char *argv []) +{ + gnome_init ("TableExample", "TableExample", argc, argv); + e_cursors_init (); + + gtk_widget_push_visual (gdk_rgb_get_visual ()); + gtk_widget_push_colormap (gdk_rgb_get_cmap ()); + + create_table (); + + gtk_main (); + + e_cursors_shutdown (); + return 0; +} + diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c index dcc7e244a1..2d892f0589 100644 --- a/widgets/table/e-table-example-2.c +++ b/widgets/table/e-table-example-2.c @@ -2,7 +2,8 @@ /* This code is GPL. */ #include <stdio.h> #include <string.h> -#include <gnome.h> +#include <gdk-pixbuf/gdk-pixbuf.h> + #include "gal/e-util/e-cursors.h" #include "e-table-simple.h" #include "e-table-header.h" @@ -12,8 +13,6 @@ #include "e-cell-checkbox.h" #include "e-table.h" -#include <gdk-pixbuf/gdk-pixbuf.h> - #include "table-test.h" /* diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c index 216c582753..894490baf0 100644 --- a/widgets/table/e-table-field-chooser-dialog.c +++ b/widgets/table/e-table-field-chooser-dialog.c @@ -21,7 +21,7 @@ */ #include <config.h> -#include <gnome.h> +#include <libgnomeui/gnome-stock.h> #include "e-table-field-chooser-dialog.h" static void e_table_field_chooser_dialog_init (ETableFieldChooserDialog *card); diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h index 502db6f473..4e8992f54a 100644 --- a/widgets/table/e-table-field-chooser-dialog.h +++ b/widgets/table/e-table-field-chooser-dialog.h @@ -21,7 +21,7 @@ #ifndef __E_TABLE_FIELD_CHOOSER_DIALOG_H__ #define __E_TABLE_FIELD_CHOOSER_DIALOG_H__ -#include <gnome.h> +#include <libgnomeui/gnome-dialog.h> #include <gal/e-table/e-table-field-chooser.h> #include <gal/e-table/e-table-header.h> diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c index 2241f5e29f..a551f75c6a 100644 --- a/widgets/table/e-table-field-chooser-item.c +++ b/widgets/table/e-table-field-chooser-item.c @@ -8,6 +8,7 @@ * Copyright 1999, 2000 Ximian, Inc. */ #include <config.h> +#include <string.h> #include <gtk/gtksignal.h> #include <gtk/gtkdnd.h> #include <libgnomeui/gnome-canvas.h> diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h index ca9917549a..ff24ebbab4 100644 --- a/widgets/table/e-table-field-chooser.h +++ b/widgets/table/e-table-field-chooser.h @@ -21,7 +21,6 @@ #ifndef __E_TABLE_FIELD_CHOOSER_H__ #define __E_TABLE_FIELD_CHOOSER_H__ -#include <gnome.h> #include <glade/glade.h> #include <gal/e-table/e-table-header.h> diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c index 540bec0645..abb2690b61 100644 --- a/widgets/table/e-table-group-container.c +++ b/widgets/table/e-table-group-container.c @@ -10,6 +10,7 @@ */ #include <config.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include <libgnomeui/gnome-canvas-rect-ellipse.h> #include "e-table-group-container.h" diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 765acd1c2e..f84a225ff7 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -13,10 +13,10 @@ * */ #include <config.h> +#include <math.h> #include <stdio.h> #include <gtk/gtksignal.h> #include <gdk/gdkkeysyms.h> -#include <math.h> #include "e-table-item.h" #include "e-table-subset.h" #include "e-cell.h" diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c index 1a95a07deb..1fab95a7e1 100644 --- a/widgets/table/e-table-memory.c +++ b/widgets/table/e-table-memory.c @@ -14,14 +14,14 @@ #include <stdio.h> #include <errno.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> +#include <gtk/gtksignal.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <gtk/gtksignal.h> -#include <stdlib.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-table-memory.h" diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c index f570a28176..d8d806afb8 100644 --- a/widgets/table/e-table-selection-model.c +++ b/widgets/table/e-table-selection-model.c @@ -8,10 +8,10 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include "e-table-selection-model.h" #include "gal/util/e-util.h" -#include <gdk/gdkkeysyms.h> #define ETSM_CLASS(e) ((ETableSelectionModelClass *)((GtkObject *)e)->klass) diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c index 3fac99b2cb..4f4ddfc7ba 100644 --- a/widgets/table/e-table-sorter.c +++ b/widgets/table/e-table-sorter.c @@ -9,8 +9,8 @@ */ #include <config.h> #include <stdlib.h> -#include <gtk/gtksignal.h> #include <string.h> +#include <gtk/gtksignal.h> #include "gal/util/e-util.h" #include "e-table-sorter.h" diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c index a60aec1ac8..8124f9b666 100644 --- a/widgets/table/e-table-subset-variable.c +++ b/widgets/table/e-table-subset-variable.c @@ -9,8 +9,8 @@ */ #include <config.h> #include <stdlib.h> -#include <gtk/gtksignal.h> #include <string.h> +#include <gtk/gtksignal.h> #include "gal/util/e-util.h" #include "e-table-subset-variable.h" diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c index 2994d3e273..febdfec56a 100644 --- a/widgets/table/e-table.c +++ b/widgets/table/e-table.c @@ -13,10 +13,12 @@ #include <stdio.h> #include <string.h> #include <stdio.h> -#include "gal/util/e-i18n.h" -#include <libgnomeui/gnome-canvas.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> +#include <libgnomeui/gnome-canvas.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> +#include "gal/util/e-i18n.h" #include "gal/util/e-util.h" #include "gal/widgets/e-canvas.h" #include "gal/widgets/e-canvas-vbox.h" diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c index 886c7beb0f..081716f0f1 100644 --- a/widgets/table/e-tree-memory.c +++ b/widgets/table/e-tree-memory.c @@ -16,12 +16,12 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> +#include <stdlib.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> #include <gtk/gtksignal.h> -#include <stdlib.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-tree-memory.h" diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c index 24eada7d56..895b3fb3cd 100644 --- a/widgets/table/e-tree-model.c +++ b/widgets/table/e-tree-model.c @@ -14,6 +14,7 @@ #include <stdio.h> #include <errno.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -21,7 +22,6 @@ #include <gnome-xml/xmlmemory.h> #include <gtk/gtksignal.h> -#include <stdlib.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-tree-model.h" diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c index 554c071254..3c0c3d22a3 100644 --- a/widgets/table/e-tree-selection-model.c +++ b/widgets/table/e-tree-selection-model.c @@ -8,6 +8,7 @@ * (C) 2000, 2001 Ximian, Inc. */ #include <config.h> +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> #include "e-tree-selection-model.h" #include <gal/util/e-bit-array.h> diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h index 10fb35a211..e95ce97e68 100644 --- a/widgets/table/e-tree-selection-model.h +++ b/widgets/table/e-tree-selection-model.h @@ -2,7 +2,9 @@ #ifndef _E_TREE_SELECTION_MODEL_H_ #define _E_TREE_SELECTION_MODEL_H_ +#include <gdk/gdktypes.h> #include <gtk/gtkobject.h> +#include <gal/util/e-sorter.h> #include <gal/widgets/e-selection-model.h> #include <gal/e-table/e-tree-model.h> diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c index 754876de27..06f9b1b261 100644 --- a/widgets/table/e-tree-sorted-variable.c +++ b/widgets/table/e-tree-sorted-variable.c @@ -9,8 +9,8 @@ */ #include <config.h> #include <stdlib.h> -#include <gtk/gtksignal.h> #include <string.h> +#include <gtk/gtksignal.h> #include "gal/util/e-util.h" #include "e-tree-sorted-variable.h" diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c index 38f92bd3e4..7c3ca95287 100644 --- a/widgets/table/e-tree-sorted.c +++ b/widgets/table/e-tree-sorted.c @@ -18,6 +18,7 @@ #include <stdio.h> #include <errno.h> +#include <stdlib.h> #include <unistd.h> #include <fcntl.h> @@ -25,7 +26,6 @@ #include <gnome-xml/xmlmemory.h> #include <gtk/gtksignal.h> -#include <stdlib.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-tree-sorted.h" diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c index 330cecec3a..5498d82358 100644 --- a/widgets/table/e-tree-table-adapter.c +++ b/widgets/table/e-tree-table-adapter.c @@ -12,11 +12,11 @@ #include <stdlib.h> #include <string.h> #include <gtk/gtksignal.h> +#include <gnome-xml/tree.h> +#include <gnome-xml/parser.h> #include "gal/util/e-util.h" #include "gal/util/e-xml-utils.h" #include "e-tree-table-adapter.h" -#include "gnome-xml/tree.h" -#include "gnome-xml/parser.h" #define PARENT_TYPE E_TABLE_MODEL_TYPE #define d(x) diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 014009a41a..42b279bef3 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -9,15 +9,15 @@ * Copyright 1999, 2000, 2001, Ximian, Inc */ #include <config.h> -#include "e-tree.h" - #include <stdlib.h> #include <stdio.h> #include <string.h> #include <stdio.h> -#include "gal/util/e-i18n.h" +#include <gdk/gdkkeysyms.h> #include <gtk/gtksignal.h> +#include <libgnomeui/gnome-canvas-rect-ellipse.h> +#include "gal/util/e-i18n.h" #include <gal/util/e-util.h> #include <gal/widgets/e-canvas.h> @@ -37,6 +37,8 @@ #include <gal/e-table/e-tree-sorted.h> #include <gal/e-table/e-tree-table-adapter.h> +#include "e-tree.h" + #define COLUMN_HEADER_HEIGHT 16 #define PARENT_TYPE gtk_table_get_type () diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h index 668fb8dc8d..c5cdaccdb8 100644 --- a/widgets/table/e-tree.h +++ b/widgets/table/e-tree.h @@ -4,6 +4,11 @@ #include <gtk/gtktable.h> #include <gnome-xml/tree.h> +#include <libgnomeui/gnome-canvas.h> +#include <gal/e-table/e-table-header.h> +#include <gal/e-table/e-table-group.h> +#include <gal/e-table/e-table-sort-info.h> +#include <gal/e-table/e-table-item.h> #include <gal/widgets/e-printable.h> |