diff options
| author | Miguel de Icaza <miguel@gnu.org> | 2000-04-06 14:46:20 +0800 |
|---|---|---|
| committer | Miguel de Icaza <miguel@src.gnome.org> | 2000-04-06 14:46:20 +0800 |
| commit | bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69 (patch) | |
| tree | 10b8992cf86eb9aa0221266742d255dfaabcc08d /widgets/table/e-cell-text.c | |
| parent | 3d9889baee9c5c11cd960a43c0f51c449ce35b45 (diff) | |
| download | gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.gz gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.tar.zst gsoc2013-evolution-bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69.zip | |
Load the icons from the installation path, not form the GNOME-libs
2000-04-06 Miguel de Icaza <miguel@gnu.org>
* shell/e-shortcut.c (shell_icon_cb): Load the icons from the
installation path, not form the GNOME-libs installation prefix.
(shell_icon_cb): Memory leak fix.
* shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES
installation directory here.
* art/Makefile.am (images_DATA): Renamed from pixmaps to images.
2000-04-06 Miguel de Icaza <miguel@gnu.org>
* message-list.c: Stick pixmaps here.
* mail-display.c (embeddable_destroy_cb): Replaced C++ comments
with C comments.
* message-list.c (load_internal_images): New function, loads images.
(message_list_init_renderers): Load images, fix previous attempt
at loading images.
* Makefile.am (dist-hook): Added distribution of pixmaps.
* pixmaps: New directory, used to hold the XPMs we ship with.
* pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's
envelopes incorporated.
2000-04-06 Miguel de Icaza <miguel@gnu.org>
* e-cell-text.c: Killed ARG_EDITABLE.
(ect_event): Updated to new editable setup.
(e_cell_text_new): Kill editable argument.
* e-cell-toggle.c (etog_event): Handle editability here
* e-cell-text.h: Removed editable bit field from here, it is now
taken care at the e-cell level.
* e-cell.c (e_cell_set_editable): New function.
(e_cell_init): Set editable to TRUE by default.
* test-check.c (check_test): update to new api
* test-table.c (table_browser_test): ditto.
(do_e_table_demo): ditto.
* test-cols.c (multi_cols_test): ditto
svn path=/trunk/; revision=2302
Diffstat (limited to 'widgets/table/e-cell-text.c')
| -rw-r--r-- | widgets/table/e-cell-text.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index ac3eb292a9..45eec9cb0f 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -70,7 +70,6 @@ enum { ARG_FILL_STIPPLE, ARG_TEXT_WIDTH, ARG_TEXT_HEIGHT, - ARG_EDITABLE, ARG_USE_ELLIPSIS, ARG_ELLIPSIS }; @@ -786,7 +785,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, return TRUE; } - if ((!edit_display) && ect->editable) { + if ((!edit_display) && E_CELL_IS_EDITABLE (ect)) { e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row); ect_edit_select_all (text_view); edit = text_view->edit; @@ -817,7 +816,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, event->button.x -= 4; event->button.y -= 1; if ((!edit_display) - && ect->editable + && E_CELL_IS_EDITABLE (ect) && event->type == GDK_BUTTON_RELEASE && event->button.button == 1) { GdkEventButton button = event->button; @@ -1092,15 +1091,13 @@ e_cell_text_class_init (GtkObjectClass *object_class) E_MAKE_TYPE(e_cell_text, "ECellText", ECellText, e_cell_text_class_init, NULL, PARENT_TYPE); ECell * -e_cell_text_new (ETableModel *etm, const char *fontname, GtkJustification justify, gboolean editable) +e_cell_text_new (ETableModel *etm, const char *fontname, GtkJustification justify) { ECellText *ect = gtk_type_new (e_cell_text_get_type ()); ect->ellipsis = NULL; ect->use_ellipsis = TRUE; - ect->editable = editable; - ect->font_name = g_strdup (fontname); ect->justify = justify; |