From 851da107c9d0680336362478d6dcbe50efeaa5ab Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Sun, 22 Feb 2009 15:16:04 +0000 Subject: Purge WITH_PRINT svn path=/trunk/netsurf/; revision=6601 --- Docs/Doxyfile | 2 +- riscos/dialog.c | 2 -- riscos/gui.c | 12 ------------ riscos/print.c | 3 --- riscos/print.h | 3 --- riscos/window.c | 2 -- utils/config.h | 2 -- 7 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Docs/Doxyfile b/Docs/Doxyfile index 13b397ff6..4ff6d8981 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_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL 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_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL 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 26e306645..a66c2e7d8 100644 --- a/riscos/dialog.c +++ b/riscos/dialog.c @@ -136,9 +136,7 @@ void ro_gui_dialog_init(void) #endif /* print */ -#ifdef WITH_PRINT ro_gui_print_init(); -#endif /* about us */ dialog_info = ro_gui_dialog_create("info"); diff --git a/riscos/gui.c b/riscos/gui.c index cea055bf0..49986cb7e 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -75,9 +75,7 @@ #ifdef WITH_PLUGIN #include "riscos/plugin.h" #endif -#ifdef WITH_PRINT #include "riscos/print.h" -#endif #include "riscos/query.h" #include "riscos/save.h" #include "riscos/save_complete.h" @@ -235,11 +233,9 @@ static wimp_MESSAGE_LIST(42) task_messages = { { message_PLUG_IN_ACTION, /* message_PLUG_IN_INFORMED, (not provided by oslib) */ #endif -#ifdef WITH_PRINT message_PRINT_SAVE, message_PRINT_ERROR, message_PRINT_TYPE_ODD, -#endif 0 } }; @@ -1336,20 +1332,16 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message) ro_msg_terminate_filename((wimp_full_message_data_xfer*)message); if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) { -#ifdef WITH_PRINT if (ro_print_current_window) ro_print_dataload_bounce(message); -#endif } else ro_msg_dataload(message); break; case message_DATA_LOAD_ACK: -#ifdef WITH_PRINT if (ro_print_current_window) ro_print_cleanup(); -#endif break; case message_MENU_WARNING: @@ -1442,7 +1434,6 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message) case message_PLUG_IN_ACTION: break; #endif -#ifdef WITH_PRINT case message_PRINT_SAVE: if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) ro_print_save_bounce(message); @@ -1453,7 +1444,6 @@ void ro_gui_user_message(wimp_event_no event, wimp_message *message) case message_PRINT_TYPE_ODD: ro_print_type_odd(message); break; -#endif case message_QUIT: netsurf_quit = true; @@ -1866,10 +1856,8 @@ void ro_msg_datasave_ack(wimp_message *message) { ro_msg_terminate_filename((wimp_full_message_data_xfer*)message); -#ifdef WITH_PRINT if (ro_print_ack(message)) return; -#endif switch (gui_current_drag_type) { case GUI_DRAG_DOWNLOAD_SAVE: diff --git a/riscos/print.c b/riscos/print.c index 008d63cbc..7cd391a58 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -18,7 +18,6 @@ */ #include "utils/config.h" -#ifdef WITH_PRINT #include #include @@ -952,5 +951,3 @@ void print_fonts_callback(void *context, print_fonts_count++; } - -#endif diff --git a/riscos/print.h b/riscos/print.h index 9bd3f6b6d..446ad2449 100644 --- a/riscos/print.h +++ b/riscos/print.h @@ -20,7 +20,6 @@ #define _NETSURF_RISCOS_PRINT_H_ #include "utils/config.h" -#ifdef WITH_PRINT #include #include "oslib/wimp.h" @@ -36,6 +35,4 @@ bool ro_print_ack(wimp_message *m); void ro_print_dataload_bounce(wimp_message *m); void ro_print_cleanup(void); -#endif /* WITH_PRINT */ - #endif diff --git a/riscos/window.c b/riscos/window.c index 3ff2d5c24..76d61e2f1 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -2546,11 +2546,9 @@ bool ro_gui_window_keypress(wimp_key *key) } return true; -#ifdef WITH_PRINT case IS_WIMP_KEY + wimp_KEY_PRINT: return ro_gui_menu_handle_action(g->window, BROWSER_PRINT, false); -#endif case IS_WIMP_KEY | wimp_KEY_LEFT: case IS_WIMP_KEY | wimp_KEY_RIGHT: diff --git a/utils/config.h b/utils/config.h index 12b4236d6..d3c9d2e83 100644 --- a/utils/config.h +++ b/utils/config.h @@ -47,8 +47,6 @@ char *strndup(const char *s, size_t n); #define WITH_URL /* Free text search */ #define WITH_SEARCH - /* Printing support */ - #define WITH_PRINT /* Theme auto-install */ #define WITH_THEME_INSTALL #elif defined(__HAIKU__) || defined(__BEOS__) -- cgit v1.2.3