diff options
| -rw-r--r-- | gtk/scaffolding.c | 19 | ||||
| -rw-r--r-- | riscos/print.c | 7 |
2 files changed, 15 insertions, 11 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index c8069c096..93cd7f768 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -32,7 +32,7 @@ #include "utils/nsoption.h" #include "utils/file.h" #include "desktop/browser_history.h" -#include "desktop/browser_private.h" +#include "desktop/browser.h" #include "desktop/hotlist.h" #include "desktop/netsurf.h" #include "desktop/plotters.h" @@ -674,8 +674,8 @@ MULTIHANDLER(savepage) return TRUE; } closedir(d); - save_complete(nsgtk_get_browser_window( - g->top_level)->current_content, path, NULL); + save_complete(browser_window_get_content(nsgtk_get_browser_window( + g->top_level)), path, NULL); g_free(path); gtk_widget_destroy(fc); @@ -747,7 +747,8 @@ MULTIHANDLER(pdf) } /* This will clean up the print_settings object for us */ - print_basic_run(bw->current_content, &pdf_printer, settings); + print_basic_run(browser_window_get_content(bw), + &pdf_printer, settings); } gtk_widget_destroy(save_dialog); @@ -790,8 +791,9 @@ MULTIHANDLER(plaintext) if (gtk_dialog_run(GTK_DIALOG(fc)) == GTK_RESPONSE_ACCEPT) { filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fc)); - save_as_text(nsgtk_get_browser_window( - g->top_level)->current_content, filename); + save_as_text(browser_window_get_content( + nsgtk_get_browser_window( + g->top_level)), filename); g_free(filename); } @@ -845,7 +847,7 @@ MULTIHANDLER(print) } } - content_to_print = bw->current_content; + content_to_print = browser_window_get_content(bw); page_setup = gtk_print_run_page_setup_dialog(g->window, NULL, NULL); if (page_setup == NULL) { @@ -865,7 +867,8 @@ MULTIHANDLER(print) g_signal_connect(print_op, "end_print", G_CALLBACK(gtk_print_signal_end_print), nssettings); - if (content_get_type(bw->current_content) != CONTENT_TEXTPLAIN) { + if (content_get_type(browser_window_get_content(bw)) != + CONTENT_TEXTPLAIN) { res = gtk_print_operation_run(print_op, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, g->window, diff --git a/riscos/print.c b/riscos/print.c index 1f252448e..1d9ed3e43 100644 --- a/riscos/print.c +++ b/riscos/print.c @@ -37,7 +37,7 @@ #include "utils/nsoption.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser_private.h" +#include "desktop/browser.h" #include "desktop/plotters.h" #include "riscos/gui.h" @@ -282,7 +282,8 @@ bool ro_gui_print_apply(wimp_w w) print_bg_images = ro_gui_get_icon_selected_state(dialog_print, ICON_PRINT_BG_IMAGES); - print_send_printsave(ro_print_current_window->bw->current_content); + print_send_printsave(browser_window_get_content( + ro_print_current_window->bw)); return true; } @@ -548,7 +549,7 @@ bool print_document(struct gui_window *g, const char *filename) int left, right, top, bottom, width, height; int saved_width, saved_height; int yscroll = 0, sheets = print_max_sheets; - hlcache_handle *h = g->bw->current_content; + hlcache_handle *h = browser_window_get_content(g->bw); const char *error_message; pdriver_features features; os_fw fhandle, old_job = 0; |