diff options
Diffstat (limited to 'widgets')
-rw-r--r-- | widgets/misc/e-popup-menu.c | 86 | ||||
-rw-r--r-- | widgets/misc/e-popup-menu.h | 45 | ||||
-rw-r--r-- | widgets/table/Makefile.am | 2 | ||||
-rw-r--r-- | widgets/table/e-table-simple.c | 297 | ||||
-rw-r--r-- | widgets/table/e-table-simple.h | 121 | ||||
-rw-r--r-- | widgets/text/e-text-model-repos.c | 20 | ||||
-rw-r--r-- | widgets/text/e-text-model-repos.h | 12 |
7 files changed, 0 insertions, 583 deletions
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c index 953d0c67dd..d47d91af99 100644 --- a/widgets/misc/e-popup-menu.c +++ b/widgets/misc/e-popup-menu.c @@ -144,89 +144,3 @@ e_popup_menu_create_with_domain (EPopupMenu *menu_list, return menu; } - -void -e_popup_menu_run (EPopupMenu *menu_list, GdkEvent *event, guint32 disable_mask, guint32 hide_mask, gpointer default_closure) -{ - GtkMenu *menu; - - g_return_if_fail (menu_list != NULL); - g_return_if_fail (event != NULL); - - menu = e_popup_menu_create (menu_list, disable_mask, hide_mask, default_closure); - - e_popup_menu (menu, event); -} - -void -e_popup_menu_copy_1 (EPopupMenu *destination, - const EPopupMenu *source) -{ - destination->name = g_strdup (source->name); - destination->pixname = g_strdup (source->pixname); - destination->fn = source->fn; - destination->submenu = e_popup_menu_copy (source->submenu); - destination->disable_mask = source->disable_mask; - - destination->pixmap_widget = source->pixmap_widget; - if (destination->pixmap_widget) - g_object_ref (destination->pixmap_widget); - destination->closure = source->closure; - - destination->is_toggle = source->is_toggle; - destination->is_radio = source->is_radio; - destination->is_active = source->is_active; - - destination->use_custom_closure = source->use_custom_closure; -} - -void -e_popup_menu_free_1 (EPopupMenu *menu_item) -{ - g_free (menu_item->name); - g_free (menu_item->pixname); - e_popup_menu_free (menu_item->submenu); - - if (menu_item->pixmap_widget) - g_object_unref (menu_item->pixmap_widget); -} - -EPopupMenu * -e_popup_menu_copy (const EPopupMenu *menu_list) -{ - gint i; - EPopupMenu *ret_val; - - if (menu_list == NULL) - return NULL; - - for (i = 0; menu_list[i].name; i++) { - /* Intentionally empty */ - } - - ret_val = g_new (EPopupMenu, i + 1); - - for (i = 0; menu_list[i].name; i++) { - e_popup_menu_copy_1 (ret_val + i, menu_list + i); - } - - /* Copy the terminator */ - e_popup_menu_copy_1 (ret_val + i, menu_list + i); - - return ret_val; -} - -void -e_popup_menu_free (EPopupMenu *menu_list) -{ - gint i; - - if (menu_list == NULL) - return; - - for (i = 0; menu_list[i].name; i++) { - e_popup_menu_free_1 (menu_list + i); - } - g_free (menu_list); -} - diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h index 627ed611a6..2af3183933 100644 --- a/widgets/misc/e-popup-menu.h +++ b/widgets/misc/e-popup-menu.h @@ -32,38 +32,7 @@ G_BEGIN_DECLS #define E_POPUP_SEPARATOR { (gchar *) "", NULL, (NULL), NULL, 0 } #define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 } -/* In the following, CC = custom closure */ - #define E_POPUP_ITEM(name,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_ITEM_CC(name,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_SUBMENU(name,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } - -#define E_POPUP_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_SUBMENU(name,pixmap,submenu,disable_mask) { (gchar *) (name), (pixmap), NULL, (submenu), (disable_mask), NULL, NULL, 0, 0, 0, 0 } - -#define E_POPUP_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } -#define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 } -#define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 } - -#define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } -#define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } - -#define E_POPUP_TOGGLE_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 } - -#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 1, 0, value, 0 } -#define E_POPUP_TOGGLE_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 1, 0, value, 1 } - -#define E_POPUP_RADIO_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } - -#define E_POPUP_RADIO_PIXMAP_ITEM(name,pixmap,fn,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_PIXMAP_ITEM_CC(name,pixmap,fn,closure,disable_mask) { (gchar *) (name), (pixmap), (fn), NULL, (disable_mask), NULL, (closure), 0, 1, value, 1 } - -#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 } -#define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 } typedef struct _EPopupMenu EPopupMenu; @@ -95,20 +64,6 @@ GtkMenu *e_popup_menu_create_with_domain (EPopupMenu *menu_list, guint32 hide_mask, void *default_closure, const gchar *domain); -void e_popup_menu_run (EPopupMenu *menu_list, - GdkEvent *event, - guint32 disable_mask, - guint32 hide_mask, - void *default_closure); - -/* Doesn't copy or free the memory. Just the contents. */ -void e_popup_menu_copy_1 (EPopupMenu *destination, - const EPopupMenu *menu_item); -void e_popup_menu_free_1 (EPopupMenu *menu_item); - -/* Copies or frees the entire structure. */ -EPopupMenu *e_popup_menu_copy (const EPopupMenu *menu_item); -void e_popup_menu_free (EPopupMenu *menu_item); G_END_DECLS diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 7a8a5c7fab..3ff3b732c6 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -52,7 +52,6 @@ libetable_la_SOURCES = \ e-table-scrolled.c \ e-table-search.c \ e-table-selection-model.c \ - e-table-simple.c \ e-table-sort-info.c \ e-table-sorted.c \ e-table-sorted-variable.c \ @@ -133,7 +132,6 @@ libetableinclude_HEADERS = \ e-table-scrolled.h \ e-table-search.h \ e-table-selection-model.h \ - e-table-simple.h \ e-table-sort-info.h \ e-table-sorted.h \ e-table-sorted-variable.h \ diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c deleted file mode 100644 index 2980bec7c0..0000000000 --- a/widgets/table/e-table-simple.c +++ /dev/null @@ -1,297 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Chris Lahey <clahey@ximian.com> - * Miguel de Icaza <miguel.ximian.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#include <config.h> - -#include "e-util/e-util.h" - -#include "e-table-simple.h" - -G_DEFINE_TYPE (ETableSimple, e_table_simple, E_TABLE_MODEL_TYPE) - -static gint -simple_column_count (ETableModel *etm) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->col_count) - return simple->col_count (etm, simple->data); - else - return 0; -} - -static gint -simple_row_count (ETableModel *etm) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->row_count) - return simple->row_count (etm, simple->data); - else - return 0; -} - -static void -simple_append_row (ETableModel *etm, ETableModel *source, gint row) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->append_row) - simple->append_row (etm, source, row, simple->data); -} - -static gpointer -simple_value_at (ETableModel *etm, gint col, gint row) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->value_at) - return simple->value_at (etm, col, row, simple->data); - else - return NULL; -} - -static void -simple_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->set_value_at) - simple->set_value_at (etm, col, row, val, simple->data); -} - -static gboolean -simple_is_cell_editable (ETableModel *etm, gint col, gint row) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->is_cell_editable) - return simple->is_cell_editable (etm, col, row, simple->data); - else - return FALSE; -} - -static gboolean -simple_has_save_id (ETableModel *etm) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->has_save_id) - return simple->has_save_id (etm, simple->data); - else - return FALSE; -} - -static gchar * -simple_get_save_id (ETableModel *etm, gint row) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->get_save_id) - return simple->get_save_id (etm, row, simple->data); - else - return NULL; -} - -/* The default for simple_duplicate_value is to return the raw value. */ -static gpointer -simple_duplicate_value (ETableModel *etm, gint col, gconstpointer value) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->duplicate_value) - return simple->duplicate_value (etm, col, value, simple->data); - else - return (gpointer)value; -} - -static void -simple_free_value (ETableModel *etm, gint col, gpointer value) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->free_value) - simple->free_value (etm, col, value, simple->data); -} - -static gpointer -simple_initialize_value (ETableModel *etm, gint col) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->initialize_value) - return simple->initialize_value (etm, col, simple->data); - else - return NULL; -} - -static gboolean -simple_value_is_empty (ETableModel *etm, gint col, gconstpointer value) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->value_is_empty) - return simple->value_is_empty (etm, col, value, simple->data); - else - return FALSE; -} - -static gchar * -simple_value_to_string (ETableModel *etm, gint col, gconstpointer value) -{ - ETableSimple *simple = E_TABLE_SIMPLE(etm); - - if (simple->value_to_string) - return simple->value_to_string (etm, col, value, simple->data); - else - return g_strdup (""); -} - -static void -e_table_simple_class_init (ETableSimpleClass *klass) -{ - ETableModelClass *model_class = E_TABLE_MODEL_CLASS (klass); - - model_class->column_count = simple_column_count; - model_class->row_count = simple_row_count; - model_class->append_row = simple_append_row; - - model_class->value_at = simple_value_at; - model_class->set_value_at = simple_set_value_at; - model_class->is_cell_editable = simple_is_cell_editable; - - model_class->has_save_id = simple_has_save_id; - model_class->get_save_id = simple_get_save_id; - - model_class->duplicate_value = simple_duplicate_value; - model_class->free_value = simple_free_value; - model_class->initialize_value = simple_initialize_value; - model_class->value_is_empty = simple_value_is_empty; - model_class->value_to_string = simple_value_to_string; -} - -static void -e_table_simple_init (ETableSimple *simple) -{ - /* nothing to do */ -} - -/** - * e_table_simple_new: - * @col_count: - * @row_count: - * @value_at: - * @set_value_at: - * @is_cell_editable: - * @duplicate_value: - * @free_value: - * @initialize_value: - * @value_is_empty: - * @value_to_string: - * @data: closure pointer. - * - * This initializes a new ETableSimpleModel object. ETableSimpleModel is - * an implementaiton of the abstract class ETableModel. The ETableSimpleModel - * is designed to allow people to easily create ETableModels without having - * to create a new GType derived from ETableModel every time they need one. - * - * Instead, ETableSimpleModel uses a setup based in callback functions, every - * callback function signature mimics the signature of each ETableModel method - * and passes the extra @data pointer to each one of the method to provide them - * with any context they might want to use. - * - * Returns: An ETableSimpleModel object (which is also an ETableModel - * object). - */ -ETableModel * -e_table_simple_new (ETableSimpleColumnCountFn col_count, - ETableSimpleRowCountFn row_count, - ETableSimpleAppendRowFn append_row, - - ETableSimpleValueAtFn value_at, - ETableSimpleSetValueAtFn set_value_at, - ETableSimpleIsCellEditableFn is_cell_editable, - - ETableSimpleHasSaveIdFn has_save_id, - ETableSimpleGetSaveIdFn get_save_id, - - ETableSimpleDuplicateValueFn duplicate_value, - ETableSimpleFreeValueFn free_value, - ETableSimpleInitializeValueFn initialize_value, - ETableSimpleValueIsEmptyFn value_is_empty, - ETableSimpleValueToStringFn value_to_string, - void *data) -{ - ETableSimple *et = g_object_new (E_TABLE_SIMPLE_TYPE, NULL); - - et->col_count = col_count; - et->row_count = row_count; - et->append_row = append_row; - - et->value_at = value_at; - et->set_value_at = set_value_at; - et->is_cell_editable = is_cell_editable; - - et->has_save_id = has_save_id; - et->get_save_id = get_save_id; - - et->duplicate_value = duplicate_value; - et->free_value = free_value; - et->initialize_value = initialize_value; - et->value_is_empty = value_is_empty; - et->value_to_string = value_to_string; - et->data = data; - - return (ETableModel *) et; -} - -gpointer -e_table_simple_string_duplicate_value (ETableModel *etm, gint col, gconstpointer val, gpointer data) -{ - return g_strdup (val); -} - -void -e_table_simple_string_free_value (ETableModel *etm, gint col, gpointer val, gpointer data) -{ - g_free (val); -} - -gpointer -e_table_simple_string_initialize_value (ETableModel *etm, gint col, gpointer data) -{ - return g_strdup (""); -} - -gboolean -e_table_simple_string_value_is_empty (ETableModel *etm, gint col, gconstpointer val, gpointer data) -{ - return !(val && * (gchar *) val); -} - -gchar * -e_table_simple_string_value_to_string (ETableModel *etm, gint col, gconstpointer val, gpointer data) -{ - return g_strdup (val); -} diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h deleted file mode 100644 index 81752a517f..0000000000 --- a/widgets/table/e-table-simple.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) version 3. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see <http://www.gnu.org/licenses/> - * - * - * Authors: - * Chris Lahey <clahey@ximian.com> - * Miguel de Icaza <miguel@ximian.com> - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - */ - -#ifndef _E_TABLE_SIMPLE_H_ -#define _E_TABLE_SIMPLE_H_ - -#include <table/e-table-model.h> - -G_BEGIN_DECLS - -#define E_TABLE_SIMPLE_TYPE (e_table_simple_get_type ()) -#define E_TABLE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SIMPLE_TYPE, ETableSimple)) -#define E_TABLE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SIMPLE_TYPE, ETableSimpleClass)) -#define E_IS_TABLE_SIMPLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SIMPLE_TYPE)) -#define E_IS_TABLE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SIMPLE_TYPE)) -#define E_TABLE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SIMPLE_TYPE, ETableSimpleClass)) - -typedef gint (*ETableSimpleColumnCountFn) (ETableModel *etm, gpointer data); -typedef gint (*ETableSimpleRowCountFn) (ETableModel *etm, gpointer data); -typedef void (*ETableSimpleAppendRowFn) (ETableModel *etm, ETableModel *model, gint row, gpointer data); - -typedef void *(*ETableSimpleValueAtFn) (ETableModel *etm, gint col, gint row, gpointer data); -typedef void (*ETableSimpleSetValueAtFn) (ETableModel *etm, gint col, gint row, gconstpointer val, gpointer data); -typedef gboolean (*ETableSimpleIsCellEditableFn) (ETableModel *etm, gint col, gint row, gpointer data); - -typedef gboolean (*ETableSimpleHasSaveIdFn) (ETableModel *etm, gpointer data); -typedef gchar *(*ETableSimpleGetSaveIdFn) (ETableModel *etm, gint row, gpointer data); - -typedef void *(*ETableSimpleDuplicateValueFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); -typedef void (*ETableSimpleFreeValueFn) (ETableModel *etm, gint col, gpointer val, gpointer data); -typedef void *(*ETableSimpleInitializeValueFn) (ETableModel *etm, gint col, gpointer data); -typedef gboolean (*ETableSimpleValueIsEmptyFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); -typedef gchar *(*ETableSimpleValueToStringFn) (ETableModel *etm, gint col, gconstpointer val, gpointer data); - -typedef struct { - ETableModel parent; - - ETableSimpleColumnCountFn col_count; - ETableSimpleRowCountFn row_count; - ETableSimpleAppendRowFn append_row; - - ETableSimpleValueAtFn value_at; - ETableSimpleSetValueAtFn set_value_at; - ETableSimpleIsCellEditableFn is_cell_editable; - - ETableSimpleHasSaveIdFn has_save_id; - ETableSimpleGetSaveIdFn get_save_id; - - ETableSimpleDuplicateValueFn duplicate_value; - ETableSimpleFreeValueFn free_value; - ETableSimpleInitializeValueFn initialize_value; - ETableSimpleValueIsEmptyFn value_is_empty; - ETableSimpleValueToStringFn value_to_string; - gpointer data; -} ETableSimple; - -typedef struct { - ETableModelClass parent_class; -} ETableSimpleClass; - -GType e_table_simple_get_type (void); -ETableModel *e_table_simple_new (ETableSimpleColumnCountFn col_count, - ETableSimpleRowCountFn row_count, - ETableSimpleAppendRowFn append_row, - ETableSimpleValueAtFn value_at, - ETableSimpleSetValueAtFn set_value_at, - ETableSimpleIsCellEditableFn is_cell_editable, - ETableSimpleHasSaveIdFn has_save_id, - ETableSimpleGetSaveIdFn get_save_id, - ETableSimpleDuplicateValueFn duplicate_value, - ETableSimpleFreeValueFn free_value, - ETableSimpleInitializeValueFn initialize_value, - ETableSimpleValueIsEmptyFn value_is_empty, - ETableSimpleValueToStringFn value_to_string, - void *data); - -/* Helper functions for if your values are all just strings. */ -void *e_table_simple_string_duplicate_value (ETableModel *etm, - gint col, - const void *val, - void *data); -void e_table_simple_string_free_value (ETableModel *etm, - gint col, - void *val, - void *data); -void *e_table_simple_string_initialize_value (ETableModel *etm, - gint col, - void *data); -gboolean e_table_simple_string_value_is_empty (ETableModel *etm, - gint col, - const void *val, - void *data); -gchar *e_table_simple_string_value_to_string (ETableModel *etm, - gint col, - const void *val, - void *data); - -G_END_DECLS - -#endif /* _E_TABLE_SIMPLE_H_ */ diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c index ef31f91def..206ef3f8c1 100644 --- a/widgets/text/e-text-model-repos.c +++ b/widgets/text/e-text-model-repos.c @@ -26,15 +26,6 @@ #define MODEL_CLAMP(model, pos) (CLAMP((pos), 0, strlen((model)->text))) gint -e_repos_shift (gint pos, gpointer data) -{ - EReposShift *info = (EReposShift *) data; - g_return_val_if_fail (data, -1); - - return e_text_model_validate_position (info->model, pos + info->change); -} - -gint e_repos_absolute (gint pos, gpointer data) { EReposAbsolute *info = (EReposAbsolute *) data; @@ -74,14 +65,3 @@ e_repos_delete_shift (gint pos, gpointer data) return e_text_model_validate_position (info->model, pos); } - -gint -e_repos_clamp (gint pos, gpointer data) -{ - ETextModel *model; - - g_return_val_if_fail (data != NULL && E_IS_TEXT_MODEL (data), -1); - model = E_TEXT_MODEL (data); - - return e_text_model_validate_position (model, pos); -} diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h index 1c602a88b6..f6d50a1111 100644 --- a/widgets/text/e-text-model-repos.h +++ b/widgets/text/e-text-model-repos.h @@ -29,13 +29,6 @@ typedef struct { ETextModel *model; - gint change; /* Relative change to position. */ -} EReposShift; - -gint e_repos_shift (gint pos, gpointer data); - -typedef struct { - ETextModel *model; gint pos; /* Position to move to. Negative values count from the end buffer. (i.e. -1 puts cursor at the end, -2 one character from end, etc.) */ } EReposAbsolute; @@ -58,9 +51,4 @@ typedef struct { gint e_repos_delete_shift (gint pos, gpointer data); -/* For e_repos_clamp, data is a pointer to an ETextModel. The only repositioning - that occurs is to avoid buffer overruns. */ - -gint e_repos_clamp (gint pos, gpointer data); - #endif |