summaryrefslogtreecommitdiff
path: root/frontends
diff options
context:
space:
mode:
Diffstat (limited to 'frontends')
-rw-r--r--frontends/gtk/corewindow.c5
-rw-r--r--frontends/gtk/plotters.c1
-rw-r--r--frontends/gtk/plotters.h6
-rw-r--r--frontends/gtk/scaffolding.c7
-rw-r--r--frontends/gtk/window.c6
5 files changed, 3 insertions, 22 deletions
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 70c3ad135..a3d606637 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -496,7 +496,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
double y2;
struct rect clip;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -508,8 +507,6 @@ nsgtk_cw_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
-
return FALSE;
}
@@ -537,12 +534,10 @@ nsgtk_cw_draw_event(GtkWidget *widget,
clip.x1 = event->area.x + event->area.width;
clip.y1 = event->area.y + event->area.height;
- current_widget = widget;
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
nsgtk_cw->draw(nsgtk_cw, &clip);
- current_widget = NULL;
cairo_destroy(current_cr);
return FALSE;
diff --git a/frontends/gtk/plotters.c b/frontends/gtk/plotters.c
index bf4de08a6..2ed1d066a 100644
--- a/frontends/gtk/plotters.c
+++ b/frontends/gtk/plotters.c
@@ -39,7 +39,6 @@
#include "gtk/scaffolding.h"
#include "gtk/bitmap.h"
-GtkWidget *current_widget;
cairo_t *current_cr;
static GdkRectangle cliprect;
diff --git a/frontends/gtk/plotters.h b/frontends/gtk/plotters.h
index c88a8da0c..453d5ceb5 100644
--- a/frontends/gtk/plotters.h
+++ b/frontends/gtk/plotters.h
@@ -16,8 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Target independent plotting (GDK / GTK+ interface).
+/**
+ * \file
+ * Target independent plotting GTK+ interface.
*/
#ifndef NETSURF_GTK_PLOTTERS_H
@@ -30,7 +31,6 @@ struct plotter_table;
extern const struct plotter_table nsgtk_plotters;
/* make sure this is NULL if no redraw is in progress */
-extern GtkWidget *current_widget;
extern cairo_t *current_cr;
void nsgtk_set_colour(colour c);
diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c
index de666c941..7a40d6656 100644
--- a/frontends/gtk/scaffolding.c
+++ b/frontends/gtk/scaffolding.c
@@ -1663,7 +1663,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
double x2;
double y2;
- current_widget = widget;
current_cr = cr;
cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
@@ -1677,8 +1676,6 @@ nsgtk_history_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
browser_window_history_redraw(bw, &ctx);
- current_widget = NULL;
-
return FALSE;
}
#else
@@ -1698,8 +1695,6 @@ nsgtk_history_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer g)
.plot = &nsgtk_plotters
};
- current_widget = widget;
-
current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget));
clip.x0 = event->area.x;
@@ -1712,8 +1707,6 @@ nsgtk_history_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer g)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index 326e57395..7432e301e 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -211,7 +211,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = cr;
GtkAdjustment *vscroll = nsgtk_layout_get_vadjustment(gw->layout);
@@ -234,8 +233,6 @@ nsgtk_window_draw_event(GtkWidget *widget, cairo_t *cr, gpointer data)
nsgtk_plot_caret(gw->caretx, gw->carety, gw->careth);
}
- current_widget = NULL;
-
return FALSE;
}
@@ -261,7 +258,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
assert(z);
assert(GTK_WIDGET(gw->layout) == widget);
- current_widget = (GtkWidget *)gw->layout;
current_cr = gdk_cairo_create(nsgtk_layout_get_bin_window(gw->layout));
clip.x0 = event->area.x;
@@ -277,8 +273,6 @@ nsgtk_window_draw_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
cairo_destroy(current_cr);
- current_widget = NULL;
-
return FALSE;
}