diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-03-12 15:59:42 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-03-12 15:59:42 +0800 |
| commit | 1f7ba945b16cd5f8c01641dd864a9671d791a651 (patch) | |
| tree | b673bc2f8f4b07554ca42cbd714ccc98efd14f9b /widgets/table/e-cell-text.c | |
| parent | f669ff481f57cf5b609ea2e8fe30cfb8dece8587 (diff) | |
| download | gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar.gz gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar.bz2 gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar.lz gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar.xz gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.tar.zst gsoc2013-evolution-1f7ba945b16cd5f8c01641dd864a9671d791a651.zip | |
Rearranged SUBDIRS for dependencies.
2000-03-12 Christopher James Lahey <clahey@helixcode.com>
* 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 <clahey@helixcode.com>
* 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
Diffstat (limited to 'widgets/table/e-cell-text.c')
| -rw-r--r-- | widgets/table/e-cell-text.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 191ac86023..422b27ff93 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -319,8 +319,8 @@ static void ect_kill_view (ECellView *ecv) { ECellTextView *text_view = (ECellTextView *) ecv; - - g_free (text_view); + + g_free(text_view); } /* @@ -351,7 +351,11 @@ ect_unrealize (ECellView *ecv) gdk_gc_unref (text_view->gc); text_view->gc = NULL; - + + if ( text_view->edit ) { + ect_cancel_edit (text_view); + } + if (text_view->font) gdk_font_unref (text_view->font); |