From 917d28e2dfdade1f8ec46122ec5e27c9409b2380 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Thu, 27 Apr 2000 17:18:51 +0000 Subject: Fixed some warnings. 2000-04-27 Christopher James Lahey * arrow-down.xpm, arrow-up.xpm, e-cell-text.c, e-cell-toggle.c, e-table-col.c, e-table-config.c, e-table-header-item.c: Fixed some warnings. svn path=/trunk/; revision=2659 --- widgets/e-table/arrow-down.xpm | 2 +- widgets/e-table/arrow-up.xpm | 2 +- widgets/e-table/e-cell-text.c | 1 - widgets/e-table/e-cell-toggle.c | 1 - widgets/e-table/e-table-col.c | 2 +- widgets/e-table/e-table-config.c | 3 ++- widgets/e-table/e-table-header-item.c | 7 +++++-- widgets/table/arrow-down.xpm | 2 +- widgets/table/arrow-up.xpm | 2 +- widgets/table/e-cell-text.c | 1 - widgets/table/e-cell-toggle.c | 1 - widgets/table/e-table-col.c | 2 +- widgets/table/e-table-config.c | 3 ++- widgets/table/e-table-header-item.c | 7 +++++-- 14 files changed, 20 insertions(+), 16 deletions(-) diff --git a/widgets/e-table/arrow-down.xpm b/widgets/e-table/arrow-down.xpm index 3717d70905..f1e6cb4b3c 100644 --- a/widgets/e-table/arrow-down.xpm +++ b/widgets/e-table/arrow-down.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * arrow_down_xpm[] = { +static const char * arrow_down_xpm[] = { "13 16 2 1", " c None", ". c #FF0000", diff --git a/widgets/e-table/arrow-up.xpm b/widgets/e-table/arrow-up.xpm index 7b609009a2..0cc5b9a00c 100644 --- a/widgets/e-table/arrow-up.xpm +++ b/widgets/e-table/arrow-up.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * arrow_up_xpm[] = { +static const char * arrow_up_xpm[] = { "13 16 2 1", " c None", ". c #FF0000", diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c index 3df3434661..b128cf26ff 100644 --- a/widgets/e-table/e-cell-text.c +++ b/widgets/e-table/e-cell-text.c @@ -748,7 +748,6 @@ static gint ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row) { ECellTextView *text_view = (ECellTextView *) ecell_view; - ECellText *ect = E_CELL_TEXT (ecell_view->ecell); ETextEventProcessorEvent e_tep_event; gboolean edit_display = FALSE; CellEdit *edit = text_view->edit; diff --git a/widgets/e-table/e-cell-toggle.c b/widgets/e-table/e-cell-toggle.c index d620112708..7331d14b84 100644 --- a/widgets/e-table/e-cell-toggle.c +++ b/widgets/e-table/e-cell-toggle.c @@ -90,7 +90,6 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); ECellToggleView *toggle_view = (ECellToggleView *) ecell_view; GdkPixbuf *image; - GdkPixbuf *flat; int x, y, width, height; const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); diff --git a/widgets/e-table/e-table-col.c b/widgets/e-table/e-table-col.c index 19f6bb1747..7bac1c4899 100644 --- a/widgets/e-table/e-table-col.c +++ b/widgets/e-table/e-table-col.c @@ -102,7 +102,7 @@ e_table_col_new_with_pixbuf (int col_idx, GdkPixbuf *pixbuf, int width, int min_ etc->selected = 0; etc->resizeable = resizable; - gtk_object_ref (etc->ecell); + gtk_object_ref (GTK_OBJECT(etc->ecell)); gdk_pixbuf_ref (etc->pixbuf); return etc; diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c index 7b4837e9b6..16cf04eec7 100644 --- a/widgets/e-table/e-table-config.c +++ b/widgets/e-table/e-table-config.c @@ -95,7 +95,8 @@ get_filter (ETable *etable) static void load_label_data (GladeXML *gui, ETable *etable) { - xmlNode *xmlRoot; + /* FIXME: Set this to the right value. */ + xmlNode *xmlRoot = NULL; char *s; /* xmlRoot = xmlDocGetRootElement (etable->specification); */ diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c index 5145a12858..65d0d3166e 100644 --- a/widgets/e-table/e-table-header-item.c +++ b/widgets/e-table/e-table-header-item.c @@ -374,7 +374,7 @@ static void ethi_add_drop_marker (ETableHeaderItem *ethi, int col) { int rx, ry; - int x, y; + int x; if (ethi->drag_mark == col) return; @@ -925,11 +925,14 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) g_hash_table_destroy (arrows); } +/* FIXME: Implement this. */ +#if 0 static GtkMenu * ethi_create_context_menu (ETableHeaderItem *ethi) { } - +#endif + static EPopupMenu ethi_context_menu [] = { { NULL, NULL, NULL, 0 } }; diff --git a/widgets/table/arrow-down.xpm b/widgets/table/arrow-down.xpm index 3717d70905..f1e6cb4b3c 100644 --- a/widgets/table/arrow-down.xpm +++ b/widgets/table/arrow-down.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * arrow_down_xpm[] = { +static const char * arrow_down_xpm[] = { "13 16 2 1", " c None", ". c #FF0000", diff --git a/widgets/table/arrow-up.xpm b/widgets/table/arrow-up.xpm index 7b609009a2..0cc5b9a00c 100644 --- a/widgets/table/arrow-up.xpm +++ b/widgets/table/arrow-up.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * arrow_up_xpm[] = { +static const char * arrow_up_xpm[] = { "13 16 2 1", " c None", ". c #FF0000", diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 3df3434661..b128cf26ff 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -748,7 +748,6 @@ static gint ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row) { ECellTextView *text_view = (ECellTextView *) ecell_view; - ECellText *ect = E_CELL_TEXT (ecell_view->ecell); ETextEventProcessorEvent e_tep_event; gboolean edit_display = FALSE; CellEdit *edit = text_view->edit; diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c index d620112708..7331d14b84 100644 --- a/widgets/table/e-cell-toggle.c +++ b/widgets/table/e-cell-toggle.c @@ -90,7 +90,6 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable, ECellToggle *toggle = E_CELL_TOGGLE (ecell_view->ecell); ECellToggleView *toggle_view = (ECellToggleView *) ecell_view; GdkPixbuf *image; - GdkPixbuf *flat; int x, y, width, height; const int value = GPOINTER_TO_INT ( e_table_model_value_at (ecell_view->e_table_model, model_col, row)); diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c index 19f6bb1747..7bac1c4899 100644 --- a/widgets/table/e-table-col.c +++ b/widgets/table/e-table-col.c @@ -102,7 +102,7 @@ e_table_col_new_with_pixbuf (int col_idx, GdkPixbuf *pixbuf, int width, int min_ etc->selected = 0; etc->resizeable = resizable; - gtk_object_ref (etc->ecell); + gtk_object_ref (GTK_OBJECT(etc->ecell)); gdk_pixbuf_ref (etc->pixbuf); return etc; diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index 7b4837e9b6..16cf04eec7 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -95,7 +95,8 @@ get_filter (ETable *etable) static void load_label_data (GladeXML *gui, ETable *etable) { - xmlNode *xmlRoot; + /* FIXME: Set this to the right value. */ + xmlNode *xmlRoot = NULL; char *s; /* xmlRoot = xmlDocGetRootElement (etable->specification); */ diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c index 5145a12858..65d0d3166e 100644 --- a/widgets/table/e-table-header-item.c +++ b/widgets/table/e-table-header-item.c @@ -374,7 +374,7 @@ static void ethi_add_drop_marker (ETableHeaderItem *ethi, int col) { int rx, ry; - int x, y; + int x; if (ethi->drag_mark == col) return; @@ -925,11 +925,14 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event) g_hash_table_destroy (arrows); } +/* FIXME: Implement this. */ +#if 0 static GtkMenu * ethi_create_context_menu (ETableHeaderItem *ethi) { } - +#endif + static EPopupMenu ethi_context_menu [] = { { NULL, NULL, NULL, 0 } }; -- cgit v1.2.3