summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-02-22 15:21:54 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-02-22 15:21:54 +0000
commit903edd1bf5b291c741ebd2e27c62be6f1fb946d1 (patch)
treea69504b6558ea79cd7e9ed535e121f41881dfd9c /riscos
parent5943c3a3ba132ed9060140d8f89a321c639f3939 (diff)
downloadnetsurf-903edd1bf5b291c741ebd2e27c62be6f1fb946d1.tar.gz
netsurf-903edd1bf5b291c741ebd2e27c62be6f1fb946d1.tar.bz2
Purge WITH_SEARCH
svn path=/trunk/netsurf/; revision=6604
Diffstat (limited to 'riscos')
-rw-r--r--riscos/dialog.c2
-rw-r--r--riscos/gui.h2
-rw-r--r--riscos/search.c2
-rw-r--r--riscos/window.c4
4 files changed, 0 insertions, 10 deletions
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 <ctype.h>
#include <string.h>
@@ -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,