From 1f7ba945b16cd5f8c01641dd864a9671d791a651 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sun, 12 Mar 2000 07:59:42 +0000 Subject: Rearranged SUBDIRS for dependencies. 2000-03-12 Christopher James Lahey * widgets/Makefile.am: Rearranged SUBDIRS for dependencies. * widgets/e-text/e-text-model.c, widgets/e-text-model.h: New object which stores a piece of text data. All methods are virtual. * widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this to use an ETextModel for its data. * widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h. * widgets/e-minicard/test-minicard-label.c: Made this work again. * widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h: Made this use an ETableModel to get its data. * widgets/e-minicard/e-minicard-label.c, widgets/e-minicard/e-minicard-label.h: Added the ability to set the text model used for the contained text widget. * widgets/e-minicard/Makefile.am: Added e-table since e-minicard is now dependent on an e-table-model for its data. * e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to speed up reflow and to make it fail less often. * addressbook/demo, addressbook/demo/.cvsignore, addressbook/demo/Makefile.am, addressbook/demo/demo.c, addressbook/demo/spec: A new program to test ETable and EMinicard integration. * configure.in: Added addressbook/demo/Makefile. * addressbook/Makefile.am: Added the demo/ subdirectory. in widgets/e-table/: 2000-03-12 Christopher James Lahey * e-table.c: Made this use an ECanvas. Fixed a bug where e_table_new_from_spec_file was calling e_table_construct instead of e_table_construct_from_spec_file. * e-table-item.c, e-table-header-item.c, e-table-column-item.c: Switched these to use GTK_TYPE_OBJECT and GTK_VALUE_OBJECT instead of GTK_TYPE_POINTER and GTK_TYPE_OBJECT. * e-cell-text.c: Got rid of a crashing bug. * e-table-text-model.c, e-table-text-model.h: A new object which is an e-text-model which uses an e-table-model for its data. * Makefile.am: Added e-table-text-model.c and e-table-text-model.h. * .cvsignore: Added table-example-1 and table-example-2. svn path=/trunk/; revision=2101 --- addressbook/gui/minicard/test-minicard-label.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'addressbook/gui/minicard/test-minicard-label.c') diff --git a/addressbook/gui/minicard/test-minicard-label.c b/addressbook/gui/minicard/test-minicard-label.c index 8da34e6f22..727d709925 100644 --- a/addressbook/gui/minicard/test-minicard-label.c +++ b/addressbook/gui/minicard/test-minicard-label.c @@ -21,6 +21,7 @@ #include #include "e-minicard-label.h" +#include "e-canvas.h" /* This is a horrible thing to do, but it is just a test. */ GnomeCanvasItem *label; @@ -80,7 +81,7 @@ int main( int argc, char *argv[] ) gnome_init( "Minicard Label Test", VERSION, argc, argv); app = gnome_app_new("Minicard Label Test", NULL); - canvas = gnome_canvas_new(); + canvas = e_canvas_new(); rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ), gnome_canvas_rect_get_type(), "x1", (double) 0, @@ -89,15 +90,15 @@ int main( int argc, char *argv[] ) "y2", (double) 100, "fill_color", "white", NULL ); - label = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ), - e_minicard_label_get_type(), - "x", (double) 0, - "y", (double) 0, - "width", (double) 100, - "height", (double) 100, - "fieldname", "Full Name:", - "field", "Christopher James Lahey", - NULL ); + label = e_minicard_label_new(gnome_canvas_root( GNOME_CANVAS( canvas ) )); + gnome_canvas_item_set( label, + "x", (double) 0, + "y", (double) 0, + "width", (double) 100, + "height", (double) 100, + "fieldname", "Full Name:", + "field", "Christopher James Lahey", + NULL ); gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ), 0, 0, 100, 100 ); -- cgit