Author: jmb Date: Sun Feb 22 09:16:04 2009 New Revision: 6601 URL: http://source.netsurf-browser.org?rev=6601&view=rev Log: Purge WITH_PRINT Modified: trunk/netsurf/Docs/Doxyfile trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/gui.c trunk/netsurf/riscos/print.c trunk/netsurf/riscos/print.h 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=6601&am... ============================================================================== --- trunk/netsurf/Docs/Doxyfile (original) +++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:16:04 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_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. Modified: trunk/netsurf/riscos/dialog.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6601&... ============================================================================== --- trunk/netsurf/riscos/dialog.c (original) +++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:16:04 2009 @@ -136,9 +136,7 @@ #endif /* print */ -#ifdef WITH_PRINT ro_gui_print_init(); -#endif /* about us */ dialog_info = ro_gui_dialog_create("info"); Modified: trunk/netsurf/riscos/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6601&... ============================================================================== --- trunk/netsurf/riscos/gui.c (original) +++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:16:04 2009 @@ -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 @@ 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 @@ 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 @@ 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 @@ case message_PRINT_TYPE_ODD: ro_print_type_odd(message); break; -#endif case message_QUIT: netsurf_quit = true; @@ -1866,10 +1856,8 @@ { 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: Modified: trunk/netsurf/riscos/print.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/print.c?rev=6601&a... ============================================================================== --- trunk/netsurf/riscos/print.c (original) +++ trunk/netsurf/riscos/print.c Sun Feb 22 09:16:04 2009 @@ -18,7 +18,6 @@ */ #include "utils/config.h" -#ifdef WITH_PRINT #include <assert.h> #include <string.h> @@ -952,5 +951,3 @@ print_fonts_count++; } - -#endif Modified: trunk/netsurf/riscos/print.h URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/print.h?rev=6601&a... ============================================================================== --- trunk/netsurf/riscos/print.h (original) +++ trunk/netsurf/riscos/print.h Sun Feb 22 09:16:04 2009 @@ -20,7 +20,6 @@ #define _NETSURF_RISCOS_PRINT_H_ #include "utils/config.h" -#ifdef WITH_PRINT #include <stdbool.h> #include "oslib/wimp.h" @@ -36,6 +35,4 @@ void ro_print_dataload_bounce(wimp_message *m); void ro_print_cleanup(void); -#endif /* WITH_PRINT */ - #endif Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=6601&... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Sun Feb 22 09:16:04 2009 @@ -2546,11 +2546,9 @@ } 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: Modified: trunk/netsurf/utils/config.h URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6601&a... ============================================================================== --- trunk/netsurf/utils/config.h (original) +++ trunk/netsurf/utils/config.h Sun Feb 22 09:16:04 2009 @@ -47,8 +47,6 @@ #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__)