callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove warning from here.

Browse Source 
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
This commit is contained in:
Miguel de Icaza
2000-03-27 02:45:04 +00:00
committed by Miguel de Icaza
parent bfdba248a1
commit 09c05cbc76
11 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/e-table/ChangeLog
View File

@ -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

8
widgets/e-table/e-table-header-item.c
View File

@ -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

2
widgets/e-table/e-table.c
View File

@ -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));

2
widgets/e-table/test-check.c
View File

@ -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);

2
widgets/e-table/test-cols.c
View File

@ -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);

2
widgets/e-table/test-table.c
View File

@ -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);

8
widgets/table/e-table-header-item.c
View File

@ -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

2
widgets/table/e-table.c
View File

@ -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));

2
widgets/table/test-check.c
View File

@ -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);

2
widgets/table/test-cols.c
View File

@ -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);

2
widgets/table/test-table.c
View File

@ -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);