Remove warning from here.

2000-03-26  Miguel de Icaza  <miguel@gnu.org>

	* e-table-header-item.c (ethi_realize): Remove warning from here.

	* test-table.c (table_browser_test): Use ECanvas, not GnomeCanvas,
	to support reflow.
	* test-cols.c (multi_cols_test): ditto
	* e-table.c (e_table_setup_header): ditto

	* e-table-header-item.c (ethi_font_load): Replace font.
	(ethi_realize): ditto.

svn path=/trunk/; revision=2172

11 files changed, 26 insertions, 18 deletions

diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index dade0d7675..54dd80fa67 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,15 @@
+2000-03-26  Miguel de Icaza  <miguel@gnu.org>
+
+	* e-table-header-item.c (ethi_realize): Remove warning from here.
+
+	* test-table.c (table_browser_test): Use ECanvas, not GnomeCanvas,
+	to support reflow.
+	* test-cols.c (multi_cols_test): ditto
+	* e-table.c (e_table_setup_header): ditto
+
+	* e-table-header-item.c (ethi_font_load): Replace font.
+	(ethi_realize): ditto.
+
 2000-03-22  Matt Loper  <matt@helixcode.com>
 
 	* e-table-text-model.c (e_table_text_model_destroy): Added some
diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c
index b079debb1a..5faa0d7da8 100644
--- a/widgets/e-table/e-table-header-item.c
+++ b/widgets/e-table/e-table-header-item.c
@@ -118,7 +118,7 @@ ethi_font_load (ETableHeaderItem *ethi, char *font)
 	
 	ethi->font = gdk_fontset_load (font);
 	if (ethi->font == NULL)
-		ethi->font = gdk_font_load ("fixed");
+		ethi->font = gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
 	
 	ethi->height = ethi->font->ascent + ethi->font->descent + PADDING;
 	if ( ethi->height < MIN_ARROW_SIZE + 4 + PADDING )
@@ -469,10 +469,8 @@ ethi_realize (GnomeCanvasItem *item)
 	gnome_canvas_get_color (item->canvas, "black", &c);
 	gdk_gc_set_foreground (ethi->gc, &c);
 
-	if (!ethi->font){
-		g_warning ("Font had not been set for this ETableHeader");
-		ethi_font_load (ethi, "fixed");
-	}
+	if (!ethi->font)
+		ethi_font_load (ethi, "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
 
 	/*
 	 * Now, configure DnD
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index dfd3dda162..2a2458adbd 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -140,7 +140,7 @@ e_table_setup_header (ETable *e_table)
 {
 	xmlNode *root;
 	xmlNode *grouping;
-	e_table->header_canvas = GNOME_CANVAS (gnome_canvas_new ());
+	e_table->header_canvas = GNOME_CANVAS (e_canvas_new ());
 	
 	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
 
diff --git a/widgets/e-table/test-check.c b/widgets/e-table/test-check.c
index 7894898255..6110c367e3 100644
--- a/widgets/e-table/test-check.c
+++ b/widgets/e-table/test-check.c
@@ -150,7 +150,7 @@ check_test (void)
 	 * GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
diff --git a/widgets/e-table/test-cols.c b/widgets/e-table/test-cols.c
index d65b9945b7..f8997ceffd 100644
--- a/widgets/e-table/test-cols.c
+++ b/widgets/e-table/test-cols.c
@@ -170,7 +170,7 @@ multi_cols_test (void)
 	 * GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 341013e92c..70c1e11ce1 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -239,7 +239,7 @@ table_browser_test (void)
 	 * Setup GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index b079debb1a..5faa0d7da8 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -118,7 +118,7 @@ ethi_font_load (ETableHeaderItem *ethi, char *font)
 	
 	ethi->font = gdk_fontset_load (font);
 	if (ethi->font == NULL)
-		ethi->font = gdk_font_load ("fixed");
+		ethi->font = gdk_font_load ("-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
 	
 	ethi->height = ethi->font->ascent + ethi->font->descent + PADDING;
 	if ( ethi->height < MIN_ARROW_SIZE + 4 + PADDING )
@@ -469,10 +469,8 @@ ethi_realize (GnomeCanvasItem *item)
 	gnome_canvas_get_color (item->canvas, "black", &c);
 	gdk_gc_set_foreground (ethi->gc, &c);
 
-	if (!ethi->font){
-		g_warning ("Font had not been set for this ETableHeader");
-		ethi_font_load (ethi, "fixed");
-	}
+	if (!ethi->font)
+		ethi_font_load (ethi, "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-iso8859-1");
 
 	/*
 	 * Now, configure DnD
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index dfd3dda162..2a2458adbd 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -140,7 +140,7 @@ e_table_setup_header (ETable *e_table)
 {
 	xmlNode *root;
 	xmlNode *grouping;
-	e_table->header_canvas = GNOME_CANVAS (gnome_canvas_new ());
+	e_table->header_canvas = GNOME_CANVAS (e_canvas_new ());
 	
 	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
 
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index 7894898255..6110c367e3 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -150,7 +150,7 @@ check_test (void)
 	 * GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index d65b9945b7..f8997ceffd 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -170,7 +170,7 @@ multi_cols_test (void)
 	 * GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 341013e92c..70c1e11ce1 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -239,7 +239,7 @@ table_browser_test (void)
 	 * Setup GUI
 	 */
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	canvas = gnome_canvas_new ();
+	canvas = e_canvas_new ();
 
 	gtk_signal_connect (GTK_OBJECT (canvas), "size_allocate",
 			    GTK_SIGNAL_FUNC (set_canvas_size), NULL);