From 3f9565753f4c7d658ea2d9f3d4f6ea1223e2e73e Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 13 Aug 2012 17:48:03 +0100 Subject: Make selection_traverse internal to desktop/selection.c. --- desktop/selection.c | 10 ++++++++-- desktop/selection.h | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'desktop') diff --git a/desktop/selection.c b/desktop/selection.c index cd19afd16..15f82bfd6 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -78,6 +78,12 @@ struct selection_string { size_t length; }; + +typedef bool (*seln_traverse_handler)(const char *text, size_t length, + struct box *box, void *handle, const char *whitespace_text, + size_t whitespace_length); + + static bool redraw_handler(const char *text, size_t length, struct box *box, void *handle, const char *whitespace_text, size_t whitespace_length); @@ -618,8 +624,8 @@ bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, * \return false iff traversal abandoned part-way through */ -bool selection_traverse(struct selection *s, seln_traverse_handler handler, - void *handle) +static bool selection_traverse(struct selection *s, + seln_traverse_handler handler, void *handle) { save_text_whitespace before = WHITESPACE_NONE; bool first = true; diff --git a/desktop/selection.h b/desktop/selection.h index 30024743d..7ece4bd85 100644 --- a/desktop/selection.h +++ b/desktop/selection.h @@ -55,11 +55,6 @@ struct selection }; -typedef bool (*seln_traverse_handler)(const char *text, size_t length, - struct box *box, void *handle, const char *whitespace_text, - size_t whitespace_length); - - struct selection *selection_create(struct content *c, bool is_html); void selection_prepare(struct selection *s, struct content *c, bool is_html); void selection_destroy(struct selection *s); @@ -102,9 +97,6 @@ char * selection_get_copy(struct selection *s); /* void selection_drag_end(struct selection *s); */ #define selection_drag_end(s) ((s)->drag_state = DRAG_NONE) -bool selection_traverse(struct selection *s, seln_traverse_handler handler, - void *handle); - bool selection_highlighted(const struct selection *s, unsigned start, unsigned end, unsigned *start_idx, unsigned *end_idx); -- cgit v1.2.3