diff options
| -rw-r--r-- | widgets/e-table/ChangeLog | 8 | ||||
| -rw-r--r-- | widgets/e-table/e-cell-text.c | 2 | ||||
| -rw-r--r-- | widgets/e-table/e-cell-tree.c | 1 | ||||
| -rw-r--r-- | widgets/e-table/e-table-item.c | 4 | ||||
| -rw-r--r-- | widgets/table/e-cell-text.c | 2 | ||||
| -rw-r--r-- | widgets/table/e-cell-tree.c | 1 | ||||
| -rw-r--r-- | widgets/table/e-table-item.c | 4 |
7 files changed, 16 insertions, 6 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 67212a7080..d4e80ff24d 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,11 @@ +2000-09-16 Christopher James Lahey <clahey@helixcode.com> + + * e-cell-text.c: Added some missing #includes. + + * e-cell-tree.c: Removed an unused variable. + + * e-table-item.c: Added some missing casts. + 2000-09-16 Iain Holmes <iain@helixcode.com> * e-cell-text.c (ect_show_tooltip): Removed g_print. diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c index c9c52ca5d6..e07c44d1d8 100644 --- a/widgets/e-table/e-cell-text.c +++ b/widgets/e-table/e-cell-text.c @@ -34,10 +34,12 @@ #include <unicode.h> #include "e-cell-text.h" #include "e-util/e-util.h" +#include "e-util/e-canvas.h" #include "e-util/e-font.h" #include "e-util/e-unicode.h" #include "e-table-item.h" #include "e-text-event-processor.h" +#include "e-text.h" #include "e-text-event-processor-emacs-like.h" #include "e-table-tooltip.h" diff --git a/widgets/e-table/e-cell-tree.c b/widgets/e-table/e-cell-tree.c index 5a055fce0e..6d8ff72cca 100644 --- a/widgets/e-table/e-cell-tree.c +++ b/widgets/e-table/e-cell-tree.c @@ -371,7 +371,6 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) ETreePath *node; GdkPixbuf *node_image; int node_image_width = 0, node_image_height = 0; - ETreePath *parent_node; int offset, subcell_offset; gboolean expanded, expandable; diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c index b1fdfc66d3..ecb5d8a59b 100644 --- a/widgets/e-table/e-table-item.c +++ b/widgets/e-table/e-table-item.c @@ -1436,7 +1436,7 @@ _do_tooltip (ETableItem *eti) for (i = 0; i < eti->tooltip->row; i++) y += ETI_ROW_HEIGHT (eti, i); eti->tooltip->y = y; - eti->tooltip->eti = eti; + eti->tooltip->eti = GNOME_CANVAS_ITEM(eti); eti->tooltip->row_height = ETI_ROW_HEIGHT (eti, i); g_print ("Tooltip at %d,%d\n", x, y); @@ -1619,7 +1619,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) eti->tooltip->row = row; eti->tooltip->cx = e->motion.x; eti->tooltip->cy = e->motion.y; - eti->tooltip->timer = gtk_timeout_add (1000, _do_tooltip, eti); + eti->tooltip->timer = gtk_timeout_add (1000, (GSourceFunc)_do_tooltip, eti); if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){ ecell_view = eti->cell_views [col]; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index c9c52ca5d6..e07c44d1d8 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -34,10 +34,12 @@ #include <unicode.h> #include "e-cell-text.h" #include "e-util/e-util.h" +#include "e-util/e-canvas.h" #include "e-util/e-font.h" #include "e-util/e-unicode.h" #include "e-table-item.h" #include "e-text-event-processor.h" +#include "e-text.h" #include "e-text-event-processor-emacs-like.h" #include "e-table-tooltip.h" diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c index 5a055fce0e..6d8ff72cca 100644 --- a/widgets/table/e-cell-tree.c +++ b/widgets/table/e-cell-tree.c @@ -371,7 +371,6 @@ ect_max_width (ECellView *ecell_view, int model_col, int view_col) ETreePath *node; GdkPixbuf *node_image; int node_image_width = 0, node_image_height = 0; - ETreePath *parent_node; int offset, subcell_offset; gboolean expanded, expandable; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index b1fdfc66d3..ecb5d8a59b 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -1436,7 +1436,7 @@ _do_tooltip (ETableItem *eti) for (i = 0; i < eti->tooltip->row; i++) y += ETI_ROW_HEIGHT (eti, i); eti->tooltip->y = y; - eti->tooltip->eti = eti; + eti->tooltip->eti = GNOME_CANVAS_ITEM(eti); eti->tooltip->row_height = ETI_ROW_HEIGHT (eti, i); g_print ("Tooltip at %d,%d\n", x, y); @@ -1619,7 +1619,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) eti->tooltip->row = row; eti->tooltip->cx = e->motion.x; eti->tooltip->cy = e->motion.y; - eti->tooltip->timer = gtk_timeout_add (1000, _do_tooltip, eti); + eti->tooltip->timer = gtk_timeout_add (1000, (GSourceFunc)_do_tooltip, eti); if (cursor_row == view_to_model_row(eti, row) && cursor_col == view_to_model_col(eti, col)){ ecell_view = eti->cell_views [col]; |