From 903edd1bf5b291c741ebd2e27c62be6f1fb946d1 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 22 Feb 2009 15:21:54 +0000 Subject: Purge WITH_SEARCH svn path=/trunk/netsurf/; revision=6604 --- Docs/Doxyfile | 2 +- riscos/dialog.c | 2 -- riscos/gui.h | 2 -- riscos/search.c | 2 -- riscos/window.c | 4 ---- utils/config.h | 2 -- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Docs/Doxyfile b/Docs/Doxyfile index c74b6d989..d928c5e0b 100644 --- a/Docs/Doxyfile +++ b/Docs/Doxyfile @@ -894,7 +894,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT +PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/riscos/dialog.c b/riscos/dialog.c index a66c2e7d8..c311df1cf 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -131,9 +131,7 @@ void ro_gui_dialog_init(void) ro_gui_wimp_event_set_help_prefix(dialog_debug, "HelpDebug"); /* search */ -#ifdef WITH_SEARCH ro_gui_search_init(); -#endif /* print */ ro_gui_print_init(); diff --git a/riscos/gui.h b/riscos/gui.h index 6f0528ee0..e9874bddb 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -198,11 +198,9 @@ extern os_t sched_time; void ro_gui_debugwin_open(void); /* in search.c */ -#ifdef WITH_SEARCH void ro_gui_search_init(void); void ro_gui_search_prepare(struct gui_window *g); bool ro_gui_search_prepare_menu(void); -#endif /* in print.c */ void ro_gui_print_init(void); diff --git a/riscos/search.c b/riscos/search.c index b58c2682c..ef4f884e0 100644 --- a/riscos/search.c +++ b/riscos/search.c @@ -22,7 +22,6 @@ */ #include "utils/config.h" -#ifdef WITH_SEARCH #include #include @@ -877,4 +876,3 @@ void show_status(bool found) found ? "" : messages_get("NotFound"), true); } -#endif diff --git a/riscos/window.c b/riscos/window.c index 76d61e2f1..1cc9e7282 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -2177,12 +2177,10 @@ bool ro_gui_toolbar_click(wimp_pointer *pointer) ro_gui_menu_handle_action(g->window, BROWSER_NAVIGATE_HOME, true); break; -#ifdef WITH_SEARCH case ICON_TOOLBAR_SEARCH: ro_gui_menu_handle_action(g->window, BROWSER_FIND_TEXT, true); break; -#endif case ICON_TOOLBAR_SCALE: ro_gui_menu_handle_action(g->window, BROWSER_SCALE_VIEW, true); @@ -2426,12 +2424,10 @@ bool ro_gui_window_keypress(wimp_key *key) return ro_gui_menu_handle_action(g->window, BROWSER_EXPORT_DRAW, false); -#ifdef WITH_SEARCH case 6: /* Ctrl + F */ case IS_WIMP_KEY + wimp_KEY_F4: /* Search */ return ro_gui_menu_handle_action(g->window, BROWSER_FIND_TEXT, false); -#endif case IS_WIMP_KEY + wimp_KEY_F5: /* Reload */ return ro_gui_menu_handle_action(g->window, diff --git a/utils/config.h b/utils/config.h index e562dfe62..fd1cf43fa 100644 --- a/utils/config.h +++ b/utils/config.h @@ -41,8 +41,6 @@ char *strndup(const char *s, size_t n); /* Platform specific features */ #if defined(riscos) - /* Free text search */ - #define WITH_SEARCH /* Theme auto-install */ #define WITH_THEME_INSTALL #elif defined(__HAIKU__) || defined(__BEOS__) -- cgit v1.2.3