Author: jmb Date: Sun Feb 22 09:21:54 2009 New Revision: 6604 URL: http://source.netsurf-browser.org?rev=6604&view=rev Log: Purge WITH_SEARCH Modified: trunk/netsurf/Docs/Doxyfile trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/gui.h trunk/netsurf/riscos/search.c trunk/netsurf/riscos/window.c trunk/netsurf/utils/config.h Modified: trunk/netsurf/Docs/Doxyfile URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6604&am... ============================================================================== --- trunk/netsurf/Docs/Doxyfile (original) +++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:21:54 2009 @@ -894,7 +894,7 @@ # 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. Modified: trunk/netsurf/riscos/dialog.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6604&... ============================================================================== --- trunk/netsurf/riscos/dialog.c (original) +++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:21:54 2009 @@ -131,9 +131,7 @@ ro_gui_wimp_event_set_help_prefix(dialog_debug, "HelpDebug"); /* search */ -#ifdef WITH_SEARCH ro_gui_search_init(); -#endif /* print */ ro_gui_print_init(); Modified: trunk/netsurf/riscos/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=6604&... ============================================================================== --- trunk/netsurf/riscos/gui.h (original) +++ trunk/netsurf/riscos/gui.h Sun Feb 22 09:21:54 2009 @@ -198,11 +198,9 @@ 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); Modified: trunk/netsurf/riscos/search.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/search.c?rev=6604&... ============================================================================== --- trunk/netsurf/riscos/search.c (original) +++ trunk/netsurf/riscos/search.c Sun Feb 22 09:21:54 2009 @@ -22,7 +22,6 @@ */ #include "utils/config.h" -#ifdef WITH_SEARCH #include <ctype.h> #include <string.h> @@ -877,4 +876,3 @@ found ? "" : messages_get("NotFound"), true); } -#endif Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=6604&... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Sun Feb 22 09:21:54 2009 @@ -2177,12 +2177,10 @@ 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 @@ 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, Modified: trunk/netsurf/utils/config.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6604&a... ============================================================================== --- trunk/netsurf/utils/config.h (original) +++ trunk/netsurf/utils/config.h Sun Feb 22 09:21:54 2009 @@ -41,8 +41,6 @@ /* Platform specific features */ #if defined(riscos) - /* Free text search */ - #define WITH_SEARCH /* Theme auto-install */ #define WITH_THEME_INSTALL #elif defined(__HAIKU__) || defined(__BEOS__)