From 5833549a357815d99d2f3450469d82e1dcc00c7c Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 9 Mar 2011 16:52:03 +0000 Subject: Purge nsgtk_plot_set_scale(), nsgtk_plot_get_scale() and nsgtk_plot_scale global. svn path=/trunk/netsurf/; revision=11943 --- gtk/plotters.c | 13 ------------- gtk/plotters.h | 2 -- gtk/scaffolding.c | 1 - gtk/thumbnail.c | 1 - gtk/treeview.c | 3 +-- gtk/window.c | 1 - 6 files changed, 1 insertion(+), 20 deletions(-) (limited to 'gtk') diff --git a/gtk/plotters.c b/gtk/plotters.c index 76273bd0e..25c5dff90 100644 --- a/gtk/plotters.c +++ b/gtk/plotters.c @@ -51,22 +51,9 @@ GdkGC *current_gc; cairo_t *current_cr; static GdkRectangle cliprect; -static float nsgtk_plot_scale = 1.0; struct plotter_table plot; -/** set plotting scale factor. */ -void nsgtk_plot_set_scale(float s) -{ - nsgtk_plot_scale = s; -} - -/** get plotting scale factor. */ -float nsgtk_plot_get_scale(void) -{ - return nsgtk_plot_scale; -} - /** Set cairo context colour to nsgtk colour. */ void nsgtk_set_colour(colour c) { diff --git a/gtk/plotters.h b/gtk/plotters.h index a59ae00bb..d4cf51426 100644 --- a/gtk/plotters.h +++ b/gtk/plotters.h @@ -37,8 +37,6 @@ extern GdkGC *current_gc; extern cairo_t *current_cr; #endif -void nsgtk_plot_set_scale(float s); -float nsgtk_plot_get_scale(void); void nsgtk_set_colour(colour c); void nsgtk_plot_caret(int x, int y, int h); diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 1a152ccd0..439515fb5 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1498,7 +1498,6 @@ static gboolean nsgtk_history_expose_event(GtkWidget *widget, current_cr = gdk_cairo_create(current_drawable); #endif plot = nsgtk_plotters; - nsgtk_plot_set_scale(1.0); clip.x0 = event->area.x; clip.y0 = event->area.y; diff --git a/gtk/thumbnail.c b/gtk/thumbnail.c index 74058798b..1935413f4 100644 --- a/gtk/thumbnail.c +++ b/gtk/thumbnail.c @@ -99,7 +99,6 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap, /* Plotters need to know thumbnail scale */ plot_scale = thumbnail_get_redraw_scale(content, cwidth); - nsgtk_plot_set_scale(plot_scale); /* set to plot to pixmap */ current_drawable = pixmap; diff --git a/gtk/treeview.c b/gtk/treeview.c index a84a502c6..b6c1c36bb 100644 --- a/gtk/treeview.c +++ b/gtk/treeview.c @@ -210,14 +210,13 @@ gboolean nsgtk_tree_window_expose_event(GtkWidget *widget, current_cr = gdk_cairo_create(current_drawable); #endif plot = nsgtk_plotters; - nsgtk_plot_set_scale(1.0);current_widget = widget; + current_widget = widget; current_drawable = widget->window; current_gc = gdk_gc_new(current_drawable); #ifdef CAIRO_VERSION current_cr = gdk_cairo_create(current_drawable); #endif plot = nsgtk_plotters; - nsgtk_plot_set_scale(1.0); tree_set_redraw(tree, true); tree_draw(tree, 0, 0, x, y, width, height); diff --git a/gtk/window.c b/gtk/window.c index 207b23f89..f400b825b 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -176,7 +176,6 @@ static gboolean nsgtk_window_expose_event(GtkWidget *widget, #endif plot = nsgtk_plotters; - nsgtk_plot_set_scale(g->bw->scale); current_redraw_browser = g->bw; clip.x0 = event->area.x; -- cgit v1.2.3